Set drag_pos before grabbing the focus, since we may reenter into

Tue Jul 20 00:45:38 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreeview.c (gtk_tree_view_button_press): Set drag_pos
	before grabbing the focus, since we may reenter into
	gtk_tree_view_motion_resize_column() which requires drag_pos
	to be set.  (#147913, Guilherme Salgado, patch by John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 802507df5e5aa437ecf0057132efec50aa9baa99..314980d735285934a2911c77d6eb6e115808f602 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
+
 Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
        use uninitialized node pointer.  (#147911, Peter Zelezny)
 
-       * gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
-
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * configure.in: Bump version number

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 802507df5e5aa437ecf0057132efec50aa9baa99..314980d735285934a2911c77d6eb6e115808f602 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,10 +1,9 @@
+
 Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
        use uninitialized node pointer.  (#147911, Peter Zelezny)
 
-       * gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
-
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * configure.in: Bump version number

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 802507df5e5aa437ecf0057132efec50aa9baa99..314980d735285934a2911c77d6eb6e115808f602 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,10 +1,9 @@
+
 Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
        use uninitialized node pointer.  (#147911, Peter Zelezny)
 
-       * gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
-
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * configure.in: Bump version number

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 802507df5e5aa437ecf0057132efec50aa9baa99..314980d735285934a2911c77d6eb6e115808f602 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,10 +1,9 @@
+
 Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
        use uninitialized node pointer.  (#147911, Peter Zelezny)
 
-       * gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
-
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * configure.in: Bump version number

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 0c3c9edd87996d9e7f507508084b92c9fb6df808..c7a3bc78e1e552a40260297d09d14240456a35dd 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2445,11 +2445,12 @@ gtk_tree_view_button_press (GtkWidget      *widget,
                                             0, 0, NULL, NULL,
                                             drag_data);
 
+         tree_view->priv->drag_pos = i;
+         tree_view->priv->x_drag = column->button->allocation.x + (rtl ? 0 : column->button->allocation.width);
+
          if (!GTK_WIDGET_HAS_FOCUS (widget))
            gtk_widget_grab_focus (widget);
 
-         tree_view->priv->drag_pos = i;
-         tree_view->priv->x_drag = column->button->allocation.x + (rtl ? 0 : column->button->allocation.width);
          return TRUE;
        }
     }